Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge #23

Merged
merged 76 commits into from
Oct 31, 2024
Merged

Upstream merge #23

merged 76 commits into from
Oct 31, 2024

Conversation

Simyon264
Copy link
Member

rawr

Jezithyr and others added 30 commits October 12, 2024 22:21
It's simple. We kill the heisentest
It's simple. We kill the heisentest
* Fix some rounds failing to end due to mind roles

Fixes #32791

This is caused by ShowRoundEndScoreboard running into a bug trying to display antags: some player is showing up as antag with MindIsAntagonist(), but has no antag roles listed in MindGetAllRoleInfo().

This was caused by one of the roles of the player having the Antag boolean set, but having no AntagPrototype set.

The responsible mind role appeared to be MindRoleSubvertedSilicon which is missing a set for the SubvertedSilicon antag prototype.

I also added resilience to the round-end code to make it so that an exception showing the scoreboard (and sending the Discord message) would not cause the round end logic to completely abort from an exception.

I am planning to add an integration test to cover this bug (no prototype in mind roles), but I'll leave that for not-the-immediate-hotfix.

* At least one maintainer approved this tiny PR without reading it, not naming names.
Fix tech anomaly nexttimer (#32805)

Co-authored-by: metalgearsloth <[email protected]>
…bjective (#32721)

* fixed warden being and qm being not considered head for traitor kill head objective

* fixed hypothetical warden traitor not getting disk objective

* change suggested by deltanedas

* cleanup

* cleanup

* fix

* changed as suggested

* removed a dot in the comment

* removed an empty line

* reformulation
Set round restart time to 5 minutes

Edited the .toml to allow people 5 minutes on centcom for extended RP.
* Implant the uplink if no PDA is found

* comments

* tidy up loose ends

* Whoops usually I start with the namespace, how did I forget it, shame shame

* Consistent data type for starting TC balance, misc changes

* Implant briefing, guidebook

* Update AutoTraitor, add uplink, codeword and briefing parameters to TraitorRuleComponent,  no pda for reinforcements

* engine 5c0ce43

* pass pda to AddUplink

Co-authored-by: slarticodefast <[email protected]>

* nicer string handling

Co-authored-by: slarticodefast <[email protected]>

* case typo 1

Co-authored-by: slarticodefast <[email protected]>

* case typo 2

Co-authored-by: slarticodefast <[email protected]>

* case typo 3

Co-authored-by: slarticodefast <[email protected]>

* minor layout changes

* removed redundant implant check

* minor cleanup

---------

Co-authored-by: slarticodefast <[email protected]>
* fix ninja bomb component check

* remove TryGetRole
HOTFIX spider clan charges can be armed again (#32866)

* fix ninja bomb component check

* remove TryGetRole
* implement

* react to revenants/AI eye

* rare maints loot

* sprite

* description

* review

Co-authored-by: slarticodefast <[email protected]>

* do changes

* stats

* networked

---------

Co-authored-by: slarticodefast <[email protected]>
Fix: Plushies no longer delete items when recycled (#32838)

fix

Co-authored-by: beck-thompson <[email protected]>
* Towels

* make smoler

* Huh, wonder why that didnt fail locally. The curse of CaPiTaLiZaTiOn

* Teal swapped for LightBlue for medical.

* Appease the linter?

* magic?

* mimery

* lefthandedness
You were already able to strip more items at once from somebody than you could hold, and they would drop to the floor. This matched the behavior in SS13.

Annoyingly, however, you were not allowed to *start* a stripping action if you're holding something. This just feels like an annoying paper cut, so this is no longer a thing.
* im so tired

* silly me

* yeah

* Update Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

---------

Co-authored-by: slarticodefast <[email protected]>
* exponential backoff for admin logs db update

* Update Content.Server/Database/ServerDbBase.cs

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
Update submodule

This fixes an important memory leak.
fix for low zombie blood

Co-authored-by: Łuaksz <[email protected]>
Update submodule

This fixes an important memory leak.
PJBot and others added 23 commits October 22, 2024 13:50
* Initial implementation

* currently it crashes on load, don't know why, maybe changing the products will provide some insight

* I was overlooking part of the yaml formatting.
* Fix several jank issues with space ninja cell upgrades.

* Rework the code to comply with maintainer request.

* Fix some naming convention & formatting errors.

* Change from a custom check to an item whitelist to avoid power cages from fitting.

* Make the EntityUid of GetCellScore non nullable.

* Remove a line from a previous solution to the above problem I forgot to remove.

* Fix the magic number issue.
* golden apprasial tool when

* thanks evan. very cool
* Atmospheric alerts computer

* Moved components, restricted access to them

* Minor tweaks

* The screen will now turn off when the computer is not powered

* Bug fix

* Adjusted label

* Updated to latest master version

* Initial commit

* Tidy up

* Add firelocks to the nav map

* Add nav map regions to atmos alerts computer

* Added support for multiple region overlay sets per grid

* Fixed issue where console values were not updating correctly

* Fixing merge conflict

* Fixing merge conflicts

* Finished all major features

* Removed station map regions (to be re-added in a separate PR)

* Improved clarity

* Adjusted the color saturation of the regions displayed on the atmos alerts computer
Packed map update, significantly changes arrivals, perma, AI core, and misc other QOL.
* Fix bug?

* Fix :)

* aaaa

* AAAA!!!

* comment

* Nicer code

* What's a pull requestWhat's a pull request?
…tem. (#32942)

Fix loneop spawnrate by reverting it to not use the custom shuttle event system.
Copy link
Contributor

RSI Diff Bot; head commit 1a60fd1 merging into 3cde44e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Devices/ai_card.rsi

State Old New Status
base Modified
empty Modified
full Modified

Resources/Textures/Objects/Specific/Chemistry/syringe.rsi

State Old New Status
syringeproj Modified
minisyringe1 Added
minisyringe2 Added
minisyringe3 Added

Resources/Textures/Objects/Tools/appraisal-tool.rsi

State Old New Status
equipped-BELT Modified
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/anti_materiel.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.rsi

State Old New Status
mag-1 Modified
mag10-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
mag10-2 Added
mag10-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/magnum.rsi

State Old New Status
mag-1 Modified
mag-2 Added
mag-3 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/pistol.rsi

State Old New Status
mag-1 Modified
mag-2 Added

Resources/Textures/Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi

State Old New Status
mag-1 Modified
magb-1 Modified
mag-2 Added
mag-3 Added
magb-2 Added
magb-3 Added

Resources/Textures/Clothing/Multiple/towel.rsi

State Old New Status
NTmono Added
equipped-BELT Added
equipped-HELMET Added
equipped-INNERCLOTHING Added
icon Added
iconstripe Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Fun/spectrallocator.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
screen Added

Resources/Textures/Objects/Weapons/Guns/Cannons/syringe_gun.rsi

State Old New Status
inhand-left Added
inhand-right Added
syringe_gun Added

@Simyon264
Copy link
Member Author

tests are failing but i do not care

@Simyon264 Simyon264 merged commit 3b7be19 into master Oct 31, 2024
13 of 15 checks passed
@Simyon264 Simyon264 deleted the upstream-merge branch October 31, 2024 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.